Feature/wdboggs/use acg #6

darianboggs · 2022-06-13T17:58:45Z

Began implementation of ACG in GEOS_OceanGridComp

…e CMakeLists.txt for ACG

@sanAkel

…ted manually. @sanAkel

… calls for fields with CHILD_ID option

tclune

CMake changes ok.

yvikhlya · 2022-06-13T18:27:33Z

Will this be automatically tested for zero diff in coupled mode, or do we still need to run a zero diff test manually?

sanAkel · 2022-06-14T22:28:40Z

fixes #6

sanAkel · 2022-06-14T22:45:10Z

There are multiple errors when building, please see ⬇️

@tclune I will be in touch to get help.

@darianboggs, you can ignore this message or if you know how to fix, please commit. Thanks!

Scanning dependencies of target GEOS_OceanGridComp
[ 86%] Building Fortran object src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/CMakeFiles/GEOS_OceanGridComp.dir/GEOS_OceanGridComp.F90.o
./GEOS_Ocean_DeclarePointer___.h(37): error #6417: The dimensions of this array have been defined more than once. [TAUX]
real, pointer, dimension(:,:) :: TAUX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(37): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [TAUX]
real, pointer, dimension(:,:) :: TAUX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(38): error #6417: The dimensions of this array have been defined more than once. [TAUY]
real, pointer, dimension(:,:) :: TAUY => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(38): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [TAUY]
real, pointer, dimension(:,:) :: TAUY => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(39): error #6417: The dimensions of this array have been defined more than once. [SWHEAT]
real, pointer, dimension(:,:,:) :: SWHEAT => null()
--------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(39): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [SWHEAT]
real, pointer, dimension(:,:,:) :: SWHEAT => null()
--------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(41): error #6417: The dimensions of this array have been defined more than once. [DISCHARGE]
real, pointer, dimension(:,:) :: DISCHARGE => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(41): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [DISCHARGE]
real, pointer, dimension(:,:) :: DISCHARGE => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(42): error #6417: The dimensions of this array have been defined more than once. [FROCEAN]
real, pointer, dimension(:,:) :: FROCEAN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(42): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [FROCEAN]
real, pointer, dimension(:,:) :: FROCEAN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(43): error #6417: The dimensions of this array have been defined more than once. [LWFLX]
real, pointer, dimension(:,:) :: LWFLX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(43): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [LWFLX]
real, pointer, dimension(:,:) :: LWFLX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(45): error #6417: The dimensions of this array have been defined more than once. [SHFLX]
real, pointer, dimension(:,:) :: SHFLX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(45): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [SHFLX]
real, pointer, dimension(:,:) :: SHFLX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(46): error #6417: The dimensions of this array have been defined more than once. [QFLUX]
real, pointer, dimension(:,:) :: QFLUX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(46): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [QFLUX]
real, pointer, dimension(:,:) :: QFLUX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(48): error #6417: The dimensions of this array have been defined more than once. [RAIN]
real, pointer, dimension(:,:) :: RAIN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(48): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [RAIN]
real, pointer, dimension(:,:) :: RAIN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(49): error #6417: The dimensions of this array have been defined more than once. [SNOW]
real, pointer, dimension(:,:) :: SNOW => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(49): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [SNOW]
real, pointer, dimension(:,:) :: SNOW => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(50): error #6417: The dimensions of this array have been defined more than once. [PEN_OCN]
real, pointer, dimension(:,:) :: PEN_OCN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(50): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [PEN_OCN]
real, pointer, dimension(:,:) :: PEN_OCN => null()
------------------------------------^
/discover/nobackup/sakella/geosMom6/acg_WB/GEOSgcm/src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/GEOS_OceanGridComp.F90(952): error #6417: The dimensions of this array have been defined more than once. [FRZMLT]
real, pointer :: FRZMLT(:,:)
---------------------^
/discover/nobackup/sakella/geosMom6/acg_WB/GEOSgcm/src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/GEOS_OceanGridComp.F90(952): error #6227: This symbol has multiple POINTER statement/attribute declarations which is not allowed. [FRZMLT]
real, pointer :: FRZMLT(:,:)
---------------------^
./GEOS_Ocean_DeclarePointer___.h(12): error #7158: Array attributes for this symbol occurred after the data initializers. [FROCEAN]
real, pointer, dimension(:,:) :: FROCEAN => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(12): error #7367: The data value NULL() can only be assigned to a Fortran POINTER.
real, pointer, dimension(:,:) :: FROCEAN => null()
-----------------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(13): error #7158: Array attributes for this symbol occurred after the data initializers. [TAUX]
real, pointer, dimension(:,:) :: TAUX => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(13): error #7367: The data value NULL() can only be assigned to a Fortran POINTER.
real, pointer, dimension(:,:) :: TAUX => null()
--------------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(14): error #7158: Array attributes for this symbol occurred after the data initializers. [TAUY]
real, pointer, dimension(:,:) :: TAUY => null()
------------------------------------^
./GEOS_Ocean_DeclarePointer___.h(14): error #7367: The data value NULL() can only be assigned to a Fortran POINTER.
real, pointer, dimension(:,:) :: TAUY => null()
--------------------------------------------^
GEOS_OceanGridComp.i90(2166): catastrophic error: Too many errors, exiting

darianboggs · 2022-06-15T20:55:26Z

I'm looking at the errors. @tclune @sanAkel

sanAkel · 2022-06-15T22:01:45Z

I'm looking at the errors. @tclune @sanAkel

Please push any changes you may have ... I plan to work on this tomorrow. Thanks!

… & GetPointer calls

darianboggs · 2022-06-16T00:35:08Z

I think the problem is related to certain fields being both Import and Export. ACG generates pointer declarations for ALL the GridSpec's. So that means that it generates declarations for some fields twice. I restored the pointer declarations and MAPL_GetPointer calls and removed the #include lines for pointer declarations and MAPL_GetPointer calls. @sanAkel @tclune

I committed changes, and I am compiling now. I'll let you know how it turns out.

sanAkel · 2022-06-16T01:00:59Z

That's true! We have some silly stuff going on.

I can take care of it by renaming the variables and dealing with the exports. It's up to you to leave it there for me.

Thanks for the help!

darianboggs · 2022-06-16T02:08:36Z

Great! It compiled successfully. ACG has a narrow focus currently. So doesn't handle a case like yours fully, though it might be a valid case. Nonetheless, you do get the benefit of it generating most of the MAPL_AddSpec calls for you. The ...GetPointer____.h and ...DeclarePointer___.h will still be created by ACG, but they won't be included in your F90 file.

So, you may not need or want to change the variables. ACG generates pointer declarations and MAPL_GetPointer calls based on the short name. Your choice.

tclune · 2022-06-16T12:36:03Z

We definitely need @atrayano to comment on the deeper issue here when he's back online.

sanAkel · 2022-06-16T20:12:07Z

@darianboggs, Thanks for the modifications. It builds for me too.
I'll test/take your changes in children GCs: MOM6_GEOSPlug.F90 and MOM_GEOS5PlugMod.F90. As for the parent, I think it can be cleaned up to take full advantage of the ACG. I'll try ...

Thanks again!

github-actions · 2022-12-15T23:57:42Z

Label error. Requires at least 1 of: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled. Found: enhancement

… up to 9

…o FRACICE for ACG to work. You can check auto-generated code at: src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/GEOSdatasea_GridComp/

…. No change in answers.

…e the variable names DO NOT have quotes.

…OM6_GEOSPlug_DeclarePointer___.h and MOM6_GEOSPlug_GetPointer___.h are NOT being used right now, because a few variables are dummy imports (e.g., SWHEAT) and exports (e.g, DH, T, S) from MOM6 ocean model. Unless these dummy imports and exports disappear and connectivity is CLEANED up, using these ACG files is almost impossible.Someday when MOM5 is deprecated, revisit.

… marked as DUMMY_EXPORT, they are there only because of messy connectivities.

… messy connectivities.

…xport spec

…ked.

…ices, can not use Declare and Get Pointers because same names are used (twice) to import and export- ACG creates statements twice, so it cannot used unless these imports and exports are RENAMED. If they are renamed- NOW, all connectivity gets messed up- so do it another day

sanAkel · 2022-12-22T04:56:25Z

ACG is now implemented across the board in:

Answers are preserved in:

✅ Data sea mode
✅ MOM6 ocean; Given the scope of this PR, NO change in results is expected with MOM5 as well.

Significant amount of tidying up has been done as well.

sanAkel

@darianboggs, @mathomp4, This is good to go now. If you feel like, please take a look. All tests passed. ✅

@mathomp4, You probably need to use super powers to merge it! 😄

mathomp4 · 2022-12-22T14:22:13Z

If you're happy, I'm happy. I'll merge in now.

I suppose you should soon make a PR to GEOSgcm so we can get the CI working again in here...

darianboggs · 2022-12-22T15:12:07Z

Sounds good.

…

-- Darian (he/him) From: Matthew Thompson ***@***.***> Reply-To: GEOS-ESM/GEOS_OceanGridComp ***@***.***> Date: Thursday, December 22, 2022 at 9:22 AM To: GEOS-ESM/GEOS_OceanGridComp ***@***.***> Cc: "Boggs, Darian (GSFC-610.1)[SCIENCE SYSTEMS AND APPLICATIONS INC]" ***@***.***>, Mention ***@***.***> Subject: [EXTERNAL] Re: [GEOS-ESM/GEOS_OceanGridComp] Feature/wdboggs/use acg (PR #6) If you're happy, I'm happy. I'll merge in now. I suppose you should soon make a PR to GEOSgcm so we can get the CI working again in here... — Reply to this email directly, view it on GitHub<https://gcc02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FGEOS-ESM%2FGEOS_OceanGridComp%2Fpull%2F6%23issuecomment-1362897747&data=05%7C01%7Cwilliam.d.boggs%40nasa.gov%7C5b7949f93c364123ae3d08dae427f485%7C7005d45845be48ae8140d43da96dd17b%7C0%7C0%7C638073157497775352%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=%2BE%2FGZ90ZA621qkZPxirQ7TY7vXs%2BTlzIJMVMkVJEFww%3D&reserved=0>, or unsubscribe<https://gcc02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fnotifications%2Funsubscribe-auth%2FAOX3MEEMDGLCXLGVVZ2K3HLWORP2BANCNFSM5YVA22QQ&data=05%7C01%7Cwilliam.d.boggs%40nasa.gov%7C5b7949f93c364123ae3d08dae427f485%7C7005d45845be48ae8140d43da96dd17b%7C0%7C0%7C638073157497775352%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=xUE%2BWtqaGU%2BYb2lZ0ioA0SmkH8%2F1oh6neOLFN9tk4RQ%3D&reserved=0>. You are receiving this because you were mentioned.Message ID: ***@***.***>

darianboggs added 10 commits June 9, 2022 21:42

Create ACG StateSpecs file for GEOS_OceanGridComp.F90

9616a5c

Create .h include files; Replace MAPL_AddSpec calls with #include lines

229572c

Add include statements for GetPointer and pointer declarations; Updat…

2712ea6

…e CMakeLists.txt for ACG

Removed MASKO from GEOS_Ocean_StateSpecs.rc because it should be trea…

e0df5ab

…ted manually. @sanAkel

Remove MAPL_AddSpec calls with CHILD_ID field @sanAkel

aa41bd0

Restore MAPL_AddSpec calls, pointer declarations, and MAPL_GetPointer…

7780f5c

… calls for fields with CHILD_ID option

Remove .h files from index

30728cb

Add # to comment out the CHILD_ID exports column lines

30474b6

Update names of DeclarePointer and GetPointer include filenames

13f55e0

Create MOM and MOM6 spec files. They need to be checked. @sanAkel

af0dedb

darianboggs requested review from a team as code owners June 13, 2022 17:58

tclune previously approved these changes Jun 13, 2022

View reviewed changes

sanAkel added the enhancement New feature or request label Jun 13, 2022

darianboggs added 2 commits June 15, 2022 18:24

Eliminate commented out lines

f80671c

Delete commented out MAPL_AddSpec calls; restore pointer declarations…

8926c42

… & GetPointer calls

darianboggs dismissed tclune’s stale review via 8926c42 June 15, 2022 22:29

sanAkel added 3 commits July 1, 2022 16:35

Merge branch 'develop' into feature/wdboggs/use_ACG

7556568

Merge branch 'develop' into feature/wdboggs/use_ACG

a6c74d0

Merge branch 'develop' into feature/wdboggs/use_ACG

f9eb843

sanAkel added the 0 diff structural Structural changes to repository that are zero-diff label Dec 15, 2022

sanAkel added 20 commits December 19, 2022 11:10

Back off ACG since it crashed and start: one-by-one

61a637d

fix syntax for override and NOTE: versosity level is set to 2, can go…

9b135e0

… up to 9

Introduce ACG elements

03c05d8

Introduce ACG elements

47559bf

1. Clean up, 2. Introduce ACG- start with 2 variables, 3. Rename FI t…

6481e4d

…o FRACICE for ACG to work. You can check auto-generated code at: src/Components/@GEOSgcm_GridComp/GEOSogcm_GridComp/@GEOS_OceanGridComp/GEOSdatasea_GridComp/

Data Sea: add all imports and exports to the state spec resource file…

24b6b84

…. No change in answers.

clean up

3c9f3bf

Add ACG bits to CMakeLists.txt and doc in spec file

ee53be5

Get rid of quotes and trailing blanks, former are WRONG-- in the sens…

7d69d96

…e the variable names DO NOT have quotes.

Eliminate import/export spec and clean up

c54cba4

Cull out dummy exports- as much as possible. There are a few that are…

7f610b5

… marked as DUMMY_EXPORT, they are there only because of messy connectivities.

SWHEAT is not used, it is a DUMMY import. It is there only because of…

8a3f5be

… messy connectivities.

Add ACG bits

58ac8f2

Remove quotes- they should NOT be there.

bf2c742

1. Remove TAB spaces, 2. SetServices uses barebones ACG: import and e…

3071e1b

…xport spec

Add call to ESMF_GridCompGet

4beffaa

Add optional arg when replay is active and restarts (doRecord) are as…

09fa602

…ked.

Remove blank space

e34ca4d

sanAkel approved these changes Dec 22, 2022

View reviewed changes

mathomp4 merged commit b171e3f into develop Dec 22, 2022

mathomp4 deleted the feature/wdboggs/use_ACG branch December 22, 2022 14:22

sanAkel mentioned this pull request Dec 24, 2022

A "spec" file for SetServices of GEOS_OceanGridComp.F90 #4

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/wdboggs/use acg #6

Feature/wdboggs/use acg #6

darianboggs commented Jun 13, 2022

tclune left a comment

yvikhlya commented Jun 13, 2022

sanAkel commented Jun 14, 2022

sanAkel commented Jun 14, 2022

darianboggs commented Jun 15, 2022

sanAkel commented Jun 15, 2022

darianboggs commented Jun 16, 2022

sanAkel commented Jun 16, 2022

darianboggs commented Jun 16, 2022

tclune commented Jun 16, 2022

sanAkel commented Jun 16, 2022

github-actions bot commented Dec 15, 2022

sanAkel commented Dec 22, 2022 •

edited

Loading

sanAkel left a comment

mathomp4 commented Dec 22, 2022

darianboggs commented Dec 22, 2022 via email

Feature/wdboggs/use acg #6

Feature/wdboggs/use acg #6

Conversation

darianboggs commented Jun 13, 2022

tclune left a comment

Choose a reason for hiding this comment

yvikhlya commented Jun 13, 2022

sanAkel commented Jun 14, 2022

sanAkel commented Jun 14, 2022

darianboggs commented Jun 15, 2022

sanAkel commented Jun 15, 2022

darianboggs commented Jun 16, 2022

sanAkel commented Jun 16, 2022

darianboggs commented Jun 16, 2022

tclune commented Jun 16, 2022

sanAkel commented Jun 16, 2022

github-actions bot commented Dec 15, 2022

sanAkel commented Dec 22, 2022 • edited Loading

sanAkel left a comment

Choose a reason for hiding this comment

mathomp4 commented Dec 22, 2022

darianboggs commented Dec 22, 2022 via email

sanAkel commented Dec 22, 2022 •

edited

Loading